Merge branch '1.14.x'

Change-Id: Id363acc2eb231446cf3dbbacba8a46b884eb76dd