For https://github.com/turt2live/matrix-media-repo/issues/457
Fixes https://github.com/turt2live/matrix-media-repo/issues/443
For https://github.com/turt2live/matrix-media-repo/issues/413 For https://github.com/turt2live/matrix-media-repo/issues/409