Merge branch 'for-3.7-hierarchy' into for-3.7-test-merge