Replace-merge from branch kli.