#8548: TODOs finished