Ref c492efcb31775a65464cf68b4a249bc5bb8e6016 (cherry picked from commit ea99d77fda239c54d029223150f20cd69f9665c3)