@kouvel @janvorli It looks like the build broke from the combination of #43397 and #38225. Can one of the two of you fix this so master isn't broken?