Eng6884 review2

Don't merge, I'll squash it later.
This comment could be expanded to even a few sentences.