Added more TODOs to file
Added more TODO
Merge branch 'CN3' into CN8