2.8.6 Flag patches