TODO list updated
merge of '209169ae85a00c0c62d8c87334d582d2f9c0d552'
     and '549939a41b51443a628bb8dcb6db8ae11eecfe43'