Merged github kpcli with upstream version 2.5.