Merge: rev778 (Fix issues with paths not properly set up on staging)