Merge "Clarifying comments and todos, update current.txt." into oc-dev