Supersedes !11 (closed) but has no trailing white spaces in changes and the merge from master is removed