Merge branch 'idempotency-key-optimistic-posting' into 'develop'