Pull request id bundles/09f8a0ca404551734712cc86a550f0a063946ea4 merged upstream.