Merge "Fix small issue with task org state cleanup" into rvc-dev