Writing tests for 1.09
Merge tag '1.09' into final
1.10