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