Merge branch release/4.0 into dev

'Timeline' is not defined.