Issue #21943:shipping by site
Merge remote-tracking branch 'DATABASE/master' into 21943
due to long time lag
Issue #21943:tweaks
Merge pull request #110 from garyhgohoos/21943

21943