Merge "Prevent duplicate signals from makeparallel"