Code

Merge branch 'jc/am-3-show-corrupted-patch'