Update for M9 release