Update to dd146de9ff changes