Replace old path_prefix with new method.
Merge remote-tracking branch 'ivan/bug/hotfix' into develop