final merge

Eamon Simran Chima Earlrequested to merge
main into B

Merge everything we need onto Branch B

Edited by Eamon Simran Chima Earl

Merge request reports