Writing tests for 1.13
Merge tag '1.13' into final
1.13