Merged in changes to rhs_functions and tempmem from 9.4 branch.  Passes unit tests.