Integrate comments from Alp, Josh and RolandBerger reviewer