(cherry picked from commit 2d52367ab92429e58596d1a1ed3ef52a0a38a7aa)
Also some prefix related fixes. (cherry picked from commit fd459e96581a883e30323c840b71004aa0747169)