Integrate CR comments