PR to bring upstream to stable state