Merge latest updates from non/spire