Merge "Sonar fix: History.java"