1.21.0 security review fixes #252

Job	Run time
Fuzzing / prepare_matrix	4s
Fuzzing / code-change (memory)	58m 58s
Fuzzing / code-change (address)	8m 35s
Fuzzing / code-change (undefined)	8m 14s
	1h 15m 51s

Provide feedback