Merge branch 'gup_flag-cleanups'