Merge "Fixed the critical issues sonar encountered"