Merge branch release/4.0 into dev

Identifier 'url_prefix' is not in camel case.