Open dyniec opened 2 weeks ago
Should address #3245
Bodigrim approach seems to be working, I will replace this PR with that version
Should address #3245