Merge of release/4.0 into dev

Line is too long.