Merge branch 'hotfix/6.5.1'
better UX ;) don't judge
Merge branch 'hotfix/6.5.2' into devel