Merge branch 'hotfix/2.3.5'
Change yii-extension dep version
Merge branch 'hotfix/2.3.6' into develop