Enhanced #9337 as @klimov-paul suggested in https://github.com/yiisoft/yii2/commit/e94810551c4ce2c7c5d59dbdcbd46a653ad601bb#commitcomment-14335135
Enhanced #9337 as @klimov-paul suggested in https://github.com/yiisoft/yii2/commit/e94810551c4ce2c7c5d59dbdcbd46a653ad601bb#commitcomment-14335135

yiisoft/yii2-framework,yiisoft/yii2-framework