Merge branch 'nd/gc-lock-against-each-other'