am 3427a9fa: am 948cd57f: Merge "Inprove database dump" into jb-mr1-dev

* commit '3427a9fa537658d050a8f9246f2c8affcf5b40d2':
  Inprove database dump