Update main with changes to release/public-v6 #334

Closed dustinswales closed 2 years ago