commit trunk r4367