Merge branch 'bug-1304' into testserver-stable