Final changes for M2 release