Writing test for 4.11
Merge tag '4.11' into OO
Task 4.11 finished for OO