merging pending changes from ink.js to ink..