Backport from commit 0858f53b2a70718d8b1f4567a4348c3e9b5c4faf
Everything changes : * package source * service name * version