Merge branch 'missing-not-touch-just-warn'