Rodn move subresource controllers in Solidify

Nicolas.Rodrequested to merge
rodn-move-subresource-controllers-in-solidify into master

Merge request reports