Merge branch release/4.0 into dev

Identifier '_PathHelper_' is not in camel case.