trunk-r5512
