Merge "Factor out common code between cli utilities"