Added data window support to the edit data feature attributes
Merge