Merge branch 'hotfix-1.5.1'
Added cache container in DiConfig
Merge branch 'hotfix-1.5.2' into dev