Merge branch 'mh/config-flip-xbit-back-after-checking' into maint