related upstream merge changes I forgot