Merge branch 'konstantin.ulitin/multiple-stub-roots'