#1526 - Ashok - Added save order for fields