michaelg/dev: links for merge206