Restore push into code project
Merge pull request #305 from phvannor/offline

Restore push into code project
[managed][client][offline] Post dev merge fixes