Defect fix139 140 new branch