Real fixes for bug 993092
node_modules updates - bug 993092