Merge "Getter methods should be final"