Merge branch 'yflags-test-fixes' into maint