Merge changes I2db3c68b,I30845199 into main

* changes:
  Add unit test of GC behaviour
  Test large numbers of keys in the database