Merge changes from topic "update-common-packer"