Merge branch 'support/package_versions' into 'develop'