Merge branch 'ecto-rollback-in-test-env' into 'develop'