Merge "Update with more ToDo" into sc-dev