Merge "Various javascript optimizations (fixes bug 39959)"