Merge commit for 7.0 synchronization

Please pay special attention to commits where I (@hbrunn) resolved conflicts