Merged in changes to decide from 9.4 branch.  Passes unit tests.