Let submappers' children have their own controllers.
Merge remote-tracking branch 'YorikSar/subcollections_fix'