Merge "Only apply flag when it has been changed"