Merge branch '2020-10-15-further-cleanup_dev_xxx'

- Bring in the next round of dev_xxx cleanup patches.