case 3111 - Minor changes to availability insertion logic.
Merge branch 'case-3111' into easy