Slim injection directly in the tree
(cherry picked from commit da5b8f3) [Reviewed by Oleg S.]