case 2044 - Reordered availability table.
Merge branch 'case-2044' into develop