CDB-1308 #resolve Hard geocoding limit on all free accounts
Merge CDB-1308 into release/2.8.2