#2109 merged r10975,r10983,r10984,r10986,r10988,r10989,r10996,r11008 (grammatical evolution) from trunk to stable