case 3111 - Minor changes to availability insertion logic.
Merge remote-tracking branch 'origin/case-3111' into easy