Make a non-idempotent integration test, idempotent
Merge branch '1.9' into 1.10