Capability to add subroots
(cherry picked from commit ec9fe19)