Changes for Flags 1.2.0