I've had version 2.1.7 running and staking for 11.5 hours working great and is staying on the correct chain no more orphaned blocks all interest is getting confirmed.

Nice work devs on get the problem fix quickly.