Update master to reflect updates on branch-1.9