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