Merge "Fix persistent tasks and expand scope"