Merge remote-tracking branch 'ivan/feature/3574_path-prefix-with-dirspec' into develop