Merge branch 'jt/p4-spell-re-with-raw-string' into maint-2.43