Merge "Amend flagFlipUpdateOccurred atom"