[CB-5122] Merged both CLI 'update' sections