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