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