Merge commit 'e830a901b033aec9b5b4a910469dc01b2729d73e' into server-npm-integration