Merge branch 'sd/cd-p-show-toplevel'