Merge all modifications up to new version 1.6, and use Yii2 code standard