Merge "Inprove database dump" into jb-mr1-dev