Limit population in existing database #2340