Merge fixes: Rename general.js to general_norm.js

Also, add general.js from latest 1.9