Merge pull request #1631 from dunxen/2022-07-disabledflags