Merge commit 'xceiv-for-v3.7' into for-3.7/cleanup2