r2 commit 1 from manoj