Fixing precompile issue
Merge branch 'develop'