Add changelog entry Address review comments Alternate solution to service queues Fixup after merge
client