Merge pull request #1857 from nickvergessen/ticket/11922

[ticket/11922] Drop all keys before trying to delete columns to avoid issues
Merge remote-tracking branch 'dhruv/ticket/12007' into develop

* dhruv/ticket/12007:
  [ticket/12007] Default last_result to 0 instead of false