For now this fix was only pushed to firedragon to test whether it would help. Will be rolling out to the rest too.