Writing tests for 1.07
Writing tests for 1.08
Merge tag '1.07' into oo
Task 1.07 finished for oo
Merge tag '1.08' into oo