NXP-11359: be more aggressive at filtering out any special chars in filenames, both ways
Merge branch 'master' into 5.6.0