Merge pull request #7321 from valeriosetti/issue7272

Driver-only ECC: all three top-level modules