Merge branch 'bug-ajax-1234'