Merge "Add cleanup to cliff-based cli framework"