Merge "Fix SignatureTest failure"