Merge branch '2020-06-04-misc-bugfixes'