Merge branch 'Check_avail'
Merge branch 'master' into Check_avail