Final content sync

Ethan Heinleinrequested to merge
dev into main

Branch sync EOD 10-11

See merge request !23 (merged)

Merge request reports