Merge "Fix invalid namespace restriction when js is disabled"