Merge anwar and quine changes