[c2793] Add forgotten part of [c2791]

(based on commit 05d044f)