Merge branch 'locking/header'