Improvement of get availability
Merge
Merge