Merge "Added config_data_capable flag"