Merge changes from topic 'improve-linting'