Merge changes I3027d53f,I1233ebcc

* changes:
  Sonar majior issues
  Sonar majior issues