Pull in changes to enable end-to-end testing