Merge branch 'master' into develop
case 717 - Fix material re-ordering/update when fields are modified without drag and drop.
case 717 - Applying CR.
Merge branch 'case-717' into develop
Merge branch 'develop'