Finished merge with old HotCiv