Linking shareEvent with WS
Merge branch 'master' into github/master