Merge branch 'ss/exc-flag-is-a-collection-of-bits'