Merge branch 'for-5.7' into test-merge-for-5.7