Checked in by Rudy Xiong for Enhancement