Merge "Refactor signature compliance checking code"