Merge branch 'rs/c-auto-resets-attributes'