Also some prefix related fixes. (cherry picked from commit fd459e9658) (cherry picked from commit 99b2cbf061)
fd459e9658
99b2cbf061