Merge "Fix Location equals()" into sc-dev