Adding the same changes to HEAD as were added to BRANCH_1_9_18.