Availability check added.
Merge branch 'Availability-check'