Merge remote-tracking branch 'origin/faster-lazy-attachments' into autostaging