Merge "Onl apply flag when it has been changed"