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