Also need to confirm this PR has made it into v4.4 (https://docs.google.com/document/d/1UFrettzqPC9X4jSVVz1anjqb3-tzRcAzbp6OBFDfWDs)