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