Non-compiling version of merged branch

This commit is only for reinspection purposes to find the errors causing the
compile failures.