[trunk r16-7529-g5388fd3a3b6]
