Merged last few changes from v1.64 into v1.65. All QA passed except for known bad test2.