[CP] Refine short format flow

More information please refer to the JIRA story belonging to this change.
4 files changed