Merge branch 'hotfix/2.2.5'
Not enabled route by default, but can enabled as optional.
Merge branch 'hotfix/2.2.6' into develop