Co-authored-by: James Kirrage <james.kirrage@mortgagegym.com> closes #13972 closes #22467 closes #23754