Merge branch 'hotfix/2.5.1'
Merge branch 'release/2.5.2'
sync changelog with package changelog
make resource_filename work in deb package
Merge data