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