Merge branch 'develop' into upgrade_c++03_compatibility