Fixed compile flag
Merge branch 'develop' into out-of-core