Issue #2383843: Move to use service_container project