Changes related to def-core changes
Merge commit 'b7204d2d2b027b5f9a3555915418bd9cc803bd5a'
Fix errors composer.json