Merge pull request #4952 from bofferdn/master-p10

Revert SBE pointer to fix MPIPL