BHV-14029: blakestephens v2 branch's missing-code