### Description Cherry pick the changes in #355
Description
Cherry pick the changes in #355