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