zz

@szaboferee @majorendre I updated the diff. Please review it again when you get a chance, thanks.

@mpercy Could you please help to review the change? Thanks