Merge branch 'B65-ZK-1736' into 7.0-Stable