PDIO-95 #comment Package users CLI tool as well