Merge branch 'openflags-prep'