Merge "Removed forward slash from path"