Merged in v1.65-merge-fixes.  Tested and passing all tests