Merge branch release/4.0 into dev

Read only.<br>Identifier 'timeline_options' is not in camel case.