Merge "Fixed some IDE warnings in ChangeTags"