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