Writing tests for 1.26
Merge tag '1.26' into COMPOR