Merge branch 'hotfix/ttl-response-type'
Fix broken test with unexpected result for delete
Merge branch 'hotfix/fix-broken-delete-test' into develop