Merge "Use extra_cfg rather than add_module_block." into main