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

* commit '948cd57f3a2a0fdee9698547f9c22673f704412b':
  Inprove database dump