Merge changes from topic 'multiarch-mirrors'