Merge "Removed problems triggering Sonar errors"