Merge branch 'hotfix/2.2.5.1' into Development
Code cleanup. Is this cleaner or is this cleaner?
Comment removed
Merge branch 'release/2.3'