Port fixes from dev 2 0 #5402

Job	Run time
Run doc tests	2m 8s
Reject trailing whitespace	6s
cargo-checkmate / Cache checkmate	3s
test / Build test artifacts	8m 32s
cargo-checkmate / Cargo checkmate (build)	2m 31s
cargo-checkmate / Cargo checkmate (check)	1m 41s
cargo-checkmate / Cargo checkmate (clippy)	1m 50s
cargo-checkmate / Cargo checkmate (doc)	2m 59s
cargo-checkmate / Cargo checkmate (format)	23s
test / Run tests (1)	5m 58s
test / Run tests (2)	5m 30s
test / Run tests (3)	3m 54s
test / Run tests (4)	6m 42s
test / Run tests (5)	4m 45s
test / Run tests (6)	3m 42s
test / Run tests (7)	3m 6s
test / Run tests (8)	2m 46s
	56m 36s

Provide feedback