Merge develop into main (unsquash some commits along the way)