Writing tests for 1.26
Merge tag '1.26' into OO
Task 1.26 finished for OO