Merge remote-tracking branch 'origin/share' into share
update wording in sorting
new wording fix merge
Merge branch 'master' into share