Merge "Fix two location bugs" into sc-dev