Merge 3rd party commit for 1.8 support