Merge "Fix mac build and signal test"