Merge changes I835008be,I200058ce into main

* changes:
  Remove drop trigger after dropping table
  Test that IpMemoryStore downgrades/upgrades do not crash.