Merge "Fixed sonar issue in JsonSelect"