Changed the code to minimize side effects
Merge branch 'DataMemberOrder' into MyMaster