Merge branch 'before_spinlock'