Merge "Add isDataEnabled field." into main