#1526 - Ashok - Fixed edit issue and added spec for edit fields