3.1.x SDK Support line up with FW releases

I have an Edge 1030 and a Fenix 5X, which both have releae firmware that supports CIQ 3.1.

I can build for the Edge 1030, but cannot simulate for it.
I can simulate for the Fenix 5X, but cannot build for it.

Is there a timeline on when the SDK will be updated to line up with released device FW?

Thanks.