Applying remaining splice changes from 0.94.9-mapr branch.