Tag release 1.18

r32496