CHANGES

(cherry picked from commit 32503f3b)
(cherry picked from commit 7565a185)
19 jobs for 620-cmocka-conversions-v9_12-v9_11 in 14 minutes and 17 seconds (queued for 10 seconds)