Backport C11++ narrowing patches.
Backport patch to prevent SEGV in redirect monitoring with opaque data,