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