Merge with vichan-devel.