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