CDB-1528 Lowered from 2MB to 500KB
Merge CDB-1528 into release/2.8.2