Merge branch 'for-4.3-unified-base' into for-4.3