Adjusted org todo states
Merge branch 'master' into utcs