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