Update next with 8.0.6 and resolve conflicts

Branch: admin/update_next_with_8.0.6

Branch: next

Merged

#411 · Created 2021-02-04 · Last updated 2021-02-04

Merged pull request

Merged in admin/update_next_with_8.0.6 (pull request #411)

32632e6·Author: Joseph Parker·Closed by: Joseph Parker·2021-02-04

Merges 8.0.6 into next and resolves conflicts.