Merge changes from topic "pylint-issues"