Previously we did a hotfix for this issue https://github.com/topcoder-platform/tc-project-service/issues/631. But the hotfix breaks it in DEV. We have to fix this issue so it works good in both DEV and PROD.
