Merge "Update the usage of receiveFinishedSignal -- try 2" into sc-dev