merge 24cd7e6
Merge branch 'develop' into out-of-core