BZ1101038 Adding Availability for location