Merge remote-tracking branch 'origin/bug-1439' into testserver-stable