(cherry picked from commit 8479962862563783ce216c1aec1aa08c1da696b2) Signed-off-by: Domen Kožar <domen@dev.si>