share fix
Merge branch 'captop' into testing