Update codes form develop 3.0

Update codes form develop 3.0