case 2368 - Create the actual availability table, per issue.
Merge branch 'case-2368' into develop