Merge branch 'nd/exclude-workaround-top-heavy'