Update to 3.0-M2 2.11

pending problem with chooseTemplate
same as in the other PR, let's revet this file