merge jsdoc changes in