Fixup on share
Merge branch 'master' into live