edited to fix bug 17585
Merge remote-tracking branch 'origin/production' into production
merged from origin