Merge "make commit optional"