[fix #79986772] Code review changes.