Merge "Ensure that the blocking helper will run" into pi-dev