Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com> (cherry picked from commit 3afccecdb2)
3afccecdb2