Integrated changes from D29571