changes for 2.7-M7