Merged updates from spinlock repo and made the relevant changes to match in scribe code.