CoGroups containable not recursive (CO-447)
Merge remote-tracking branch 'upstream/develop' into develop