Fix last conflicting files

A. Wilcox requested to merge awilfox/for-beta5 into current

Closes: #1089 (closed)

Merge request reports