NXP-10119: ':' is not (always) a valid char in filenames...
Merge branch 'master' into 5.6.0