these were adopted by upstream