DB/SAI: Swift Discipline

By @untaught fixes #11118
DB/SAI: Cleansing the Scar

By @untaught fixes #11117