Merge "Add key to store location changer"