case 4312 - Ajax bug patches.
Merge branch 'case-4312' into development