diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4965112ee1..984943463c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+
+### v3.0.0-rc.NEXT Current Master
+
+#### Breaking Changes
+* editableCellTemplates should use MODEL_COL_FIELD instead of COL_FIELD.
+https://github.com/angular-ui/ng-grid/issues/1633 MODEL_COL_FIELD variable was added to the cellTemplate and editCellTemplate for utilizing the bound field in ng-model. Edit feature
+was changed to use MODEL_COL_FIELD instead of COL_FIELD for consistency.
+
+
### v3.0.0-rc.11 (2014-09-26)
diff --git a/misc/tutorial/106_binding.ngdoc b/misc/tutorial/106_binding.ngdoc
index 4679370a7d..90ad38f197 100644
--- a/misc/tutorial/106_binding.ngdoc
+++ b/misc/tutorial/106_binding.ngdoc
@@ -8,6 +8,14 @@ This tutorial shows two-way binding to properties with special characters, array
Note that a function can not be edited.
+In your custom cellTemplates, you can use:
+
+COL\_FIELD which will be replaced with grid.getCellValue(row). This should be used for any cellTemplates that need readonly access to the field value
+
+MODEL\_COL\_FIELD which will be replaced with row.entity.field. Use MODEL\_COL\_FIELD anytime you need ng-model='field'
+
+
+
@example
diff --git a/src/features/edit/js/gridEdit.js b/src/features/edit/js/gridEdit.js
index 11fa4695fb..3b45f0b5c3 100644
--- a/src/features/edit/js/gridEdit.js
+++ b/src/features/edit/js/gridEdit.js
@@ -497,7 +497,7 @@
origCellValue = cellModel($scope);
html = $scope.col.editableCellTemplate;
- html = html.replace(uiGridConstants.COL_FIELD, $scope.row.getQualifiedColField($scope.col));
+ html = html.replace(uiGridConstants.MODEL_COL_FIELD, $scope.row.getQualifiedColField($scope.col));
var optionFilter = $scope.col.colDef.editDropdownFilter ? '|' + $scope.col.colDef.editDropdownFilter : '';
html = html.replace(uiGridConstants.CUSTOM_FILTERS, optionFilter);
diff --git a/src/features/edit/templates/cellEditor.html b/src/features/edit/templates/cellEditor.html
index 572f58017e..4192f82db1 100644
--- a/src/features/edit/templates/cellEditor.html
+++ b/src/features/edit/templates/cellEditor.html
@@ -1,5 +1,5 @@