Merged SunLocation changes