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