Merge "Fixes sonar issues in Examples"