Implement wiki directive for #634 too, see issue for details