Merge branch 'bug-1393' into testserver-stable