Merge branch 'hotfix-2.2.22'
Incorrect default timeout value fixed in core.php
Merge branch 'hotfix-2.2.23' into develop