Merge branch '2020-07-07-misc-new-features'