Merge master for M2.7 release