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