Merge "Remove Flattener::reset" into sc-dev