r10400: commit merge patch from jra