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