Patches pushed (as b2eae0e1427502b171347fb173bab2547560a707 and
following) with a few modifications (splitting the Prometheus patch in
several patches, sorting inputs, etc.). Thanks.