Merge "Add --retained option to ahat"