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