[1038] 1038 branch back-ported.