Merge branch 'bug-1293' into testserver-stable