[NUCRDBMS-816] Contrib patch from Florian Schmitt around TODO.