Merge "Stop restoring tasks added before recent is loaded" into oc-dev