Merge "revive client getSignature implementation"