Fix severe server->client dimension registration issue.
Merge remote-tracking branch 'origin/master'