prepare for upstream merge