Fix some tests
Merge branch 'release-2.0.5_04' into develop