Merge upstream main into project import branch