Merge branch 'main' into evs_dec_updates