merge r5815-5828,5832-5859 from trunk