Pull request id bundles/044a3cebe68ea1c7a6b175bfd6b1c59b3e84cb35 merged upstream.
Pull request id bundles/a5cef33661485f12205db574632537726a51de3b merged upstream.