merge aaf enchancements onto master