complete, ready for code review

[#71796632]