michaelg/dev: links for msg-serv-12-21