v1.65-merge1.64-bb1