Merge branch 'lflags-test-fixes' into maint