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