Fixed depth/height in client and heightchanger.
merge