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