Merge branch '2020-08-27-misc-fixes'