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