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