Merge of release/4.0 into dev