issue #23255: Gary's bankrec work remerged with 4_7_x for CI