DB/SAI: Swift Discipline

By @untaught fixes #11118