Merge "Fix GetLocation"