Upstream merge - only one refresh patch now xD