Added TODO_FIRST_RELEASE