Branch: development_share_email
share via email related changes
merge share email branch