Merge branch 'newshare'