Merge remote-tracking branch 'public/bug14759'