Merge changes from topic 'multiarch-image-defaults'