apply 09749e7 to master