issue #20073: Fix customer shipto problems. issue #19813: Fix customer group model problems.