Merge pull request #13098 from rjmccall/bridging-peephole-optionality-bug-4.1