Avoid warning that causes problems on ajax requests
Avoid warning that causes problems on ajax requests
Merge branch 'refs/heads/xxx'