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