Update codes form develop 3.0
Merge pull request #1522 from SmallAiTT/npm_3.0

Update codes form develop 3.0