Merge "Sonar fix for SubLinks.java"