Fix for setting the DI container at CLI
Merge remote-tracking branch 'upstream/staging' into staging
Fix RuntimeException