@OldNGrey and @todoonada, please see this PR: https://github.com/zencart/zencart/pull/6319

I've verified that the changes correct each of the issues identified in this thread and would appreciate some 3rd-party validation!