Working on the master model to generalize the save rules.
Merge remote-tracking branch 'origin/master'