Another update:
We moved this fix ahead and it will be part of 2.0.4 instead. We shifted the contents of this and the next hotfix, so now 2.0.5 will be the one containing the server browser fixes instead (still coming shortly after 2.0.4, but we needed some extra time for the changes and testing to be ready).