Writing tests for 1.12
Writing tests for 1.13
Merge tag '1.12' into OO
Merge tag '1.13' into OO
Task 1.13 finished for OO