Merge changes from topic 'yamllint-fix'