BadDirectory flag removal (#13060)
Merge remote-tracking branch 'sebastian/bug13060'