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