Merge "Changes in preparation for the m2 model"