Merge "Remove mount hack" into rvc-dev