Updated to support 2.11.0-M3, removed 2.8.x