[master] Fixed #18972 -- Cleaned up fixes per charettes comments.