Sigproxy Message grooming

Rebased onto upstream master and added 1f112b5f67d34f2cf76fdadc1a2ce65bbe99a048