Merged v1.65 changes up to 027877 into v1.65-try3