Manual update to release 2.1.11
Reimplement JS global var fix