Merge branch 'main' into basop-2547-some-conditions-in-core_switching_post_dec_fx-were-wrong