Merge branch 'develop' into feature_java_external_api