Introduced a new version of the same model setup that is in 236.zip,
except in 236.zip all changes to be merged are present in master and
slave.  In this version, the changes are separated into 4 groups
master1-4 and slave1-4