Merge "Sonar Issue fixes for js"