Merge branch 'faster-lazy-attachments' into autostaging