Merge "Null check signature array before comparison" into tm-dev