Merge from upstream
Upstream JS conflicting