Merge "Update-ability: Safely remove clearFlag per Lorenzo and Jean's advice"