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