Maid 60 merge acknowledgement work in routing to next

Acknowledgement work is done on public-key branch, therefore it has the commits for both.