Merge branch 'hotfix/1.25.4'
Added releasenotes for the 2 latest hotfixes
Merge fix