Update next with 8.0.5 and resolve conflicts

Branch: admin/update-next-with-8.0.5

Branch: next

Merged

#326 · Created 2020-09-03 · Last updated 2020-09-03

Merged pull request

Merged in admin/update-next-with-8.0.5 (pull request #326)

1fa4cb4·Author: Joseph Parker·Closed by: Joseph Parker·2020-09-03

Merges 8.0.5 into next and resolves conflicts. Replaces PR 325.