Merge branch 'release/2.2.5'
This shoudn't be handled by me, it should be handled globally in config or page.
Merge branch 'hotfix/2.2.5.1' into Development