Insert 'bugfix-fix_Sonar_Bugs' into 'develop'