Merge in the master framework