Merge branch 'jc/revert-show-parent-info'