Reviewed-by: roland, thartmann
Reviewed-by: mli
Co-authored-by: He Xuejin <hexuejin2@huawei.com> Reviewed-by: neliasso, kvn, iignatyev