Merge "Modify code to take care of missing scenario in US 832"