Merge "Move 'notifyFinishedSignal' into a separate function" into sc-dev