Merge branch '2020-07-17-misc-fixes'