Merge "Use realpath to grab underlying path for userdata"