fix idempotency
Merge branch 'feature-fixset' into develop