Merge branch '2020-05-25-misc-fixes'