Merge signature changes from master