Merge "Fixed Sonar issues in JsonUpdate"