Merge "Fixed failing SectionManagerTests" into rvc-dev