Merge branch 'release/2.5'
DB update