Upstream test

This is the upstream PR