Pick up changes from master to 2.065 branch