Merge commit 'origin/roland/fixes-for-c++'