Merge "sonar critical for Exception handling"