Merge changes I6d43e553,I8e07515b,Ida4d83cd,Id70b6f40,Ic9b25d4f, ...

Merge changes I6d43e553,I8e07515b,Ida4d83cd,Id70b6f40,Ic9b25d4f, ...

* changes:
  sonar major for commented-out lines
  sonar critical for conditional statement
  sonar minor issue for unused import
  sonar major issue for commented-out lines
  sonar major issue for commented-out lines
  sonar major issue for 2 statements per line