Merge of release/4.0 into dev

Identifier '_$q_' is not in camel case.