Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into new_dpf