Merge branch 'hotfix/0.5.14'
fix partner accessing export of history
Merge branch 'hotfix/0.5.15' into develop