Ref 48be675200e817f40fa8ec25da1be2ab0839d28d
Ref 4a8000b5

(cherry picked from commit e22ef5d9017c44cad97ae541fefce76cc455edcb)