Merge some code from old base submodule.