Merging in parts from the TODO file in the old C++ branch.
Authored by: debug 2019-06-07
Parent: [r5385]
Child: [r5387]
