Merge "Only allow roots tasks to be organized" into rvc-dev