Merge "Resolve yamllint issues"