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