Merge branch 'bug-1302' into testserver-stable