Finish the work started in HHH-7667. HHH-7667 really only addressed the first bullet point. That still leaves: