Jira working on issue# 710
handling duplicated activities
Merge commit '9c42b962e95c61b150b384c81792129203aeef0a' into HEAD