Eng6884 review2

Don't merge, I'll squash it later.