Update PR after decision made during Bug Cleanup Sprint.