[BUG] - FW 21.22 - Sunrise / Sunset Alerts

Forerunner 965 with latest Firmware 21.22

I am unable to activate sunset alert, the setting does not stick either when applied directly on device or via phone app.   

The opposite is true with sunrise alert.  It is active and cannot deactivate either directly or via app.

Is there a fix for this? Is it possible to roll back the update? 

Thank you.