case 2351 - Keep availability table colspan.
Merge branch 'case-2351' into develop