Merge branch 'hotfix/v1.1.6'
Merge branch 'master' into develop
Return Plugin self as parameter on beforeCreate, beforeDestroy, afterCreate and afterDestroy