Merge from yiisoft