Support 4.3x

Merge Upstream