Merge branch 'turn-on-protectntfs-by-default'