Writing test for 3.02
Merge tag '3.02' into OO
Task 3.02 for OO