Merge main into fixing_lists to bring it up to the present #4

Closed barriejc closed 2 years ago