output format commands - update and delete
Merge remote-tracking branch 'upstream/master'