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