fixes for subsharing for release q4
Merge branch 'subshare-improve' into edge-wdr-5