Merge branch 'rec_attr_def_config_avoid_cxt_fetch'