Merged from sonar-bug-6