Signed-off-by: Stijn Segers <foss@volatilesystems.org> (cherry picked from commit 695e0dbaa4)
695e0dbaa4