Merge branch 'fix-broken-no-share' into develop