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