Backport of !573 (merged).
Signed-off-by: Andre Moreira Magalhaes andre.magalhaes@collabora.com
https://phabricator.apertis.org/T9665