Update to 3.0-M2 2.11