Merged in changes to rhs from 9.4 branch