issue #3499 : Update for core of the npm branch to work regularly.

Update for core of the npm branch to work regularly.