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