Merge "Sonar Fix: Owner.java"