fabian/prod: links for downstreaming