@ Tam-Lin,
I am yet to check with my team regarding this, however, I have personally got confirmation from two users that a proper factory reset has taken care of this issue. Hence, if you have not tried it yet then please do try that which may solve the issue for you. And also let us know the status by setting the Almond+ in Router mode.