Backmerge 0.3.1 into develop

Release `0.3.1` is rescheduled, so we need to backmerge all the patches of the `release-0.3.1` branch to the `develop` branch. Only minor conflicts were present, all of them due to #888 being merged upstream.