Merge branch 'main' into 2203-macros-basop_noglob_declare_local-basop_noglob_dev_use_globals