* Unfinished work. See changelog in next commit.
NOTE: Uncompilable.