Merge "Refractor duplicate cli script function"