Merge "Add cliff based common cli entrypoint"