Merge changes from topics 'testapi', 'yamllint'