Fix for setting the DI container at CLI
Merge branch 'staging' into renderer