Merge kif-next into master.