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