Initial changes before upstream merge