Fixed test break.
DI WIP
Merge commit 'f605508bb2805d24df98037ea239f8f582deda0e' into feature-container