CR feedback

(cherry picked from commit 0f37ba8ca9a7a6b89d6db5ea83659ee05bc2e244)