Cherry pick Fix for #373 onto the 129 branch