case 4218 - Patch for corrected availabilities.
Merge branch 'case-4218' into development