Merge "Refactor handling of <Feature Abort> responses" into sc-dev