Merge "Extract signature related utilities" into nyc-dev