Merge branch 'bc/reread-attributes-during-rebase'