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