add version 1.2 DB support
Merge remote-tracking branch 'origin/master'