partial commit 12