Merge branch release/4.0 into dev

Identifier 'project_prefix' is not in camel case.