Remove old resources path.
Merge remote-tracking branch 'ivan/bug/remove-old-resources-path' into develop