Merge branch 'main' into dlb_backport_conf_changes