Merge branch '2020-06-25-tidy-up-bd-command' into next