Update to 2.1.2 and include the fix from PR ports/93684
State Changed From-To: open->closed committed, thanks