HD-234

second part of the HUE-2061 patch.