Smart commits are processed more than once.

We have smart commits enabled between Jira and Bitbucket and we use tags like "#comment" or "#time". However, if we create a commit including the tag "#comment" on a branch and then merge that commit into a second branch, then all of our issues are updated with the "#comment" flag during the merge commit. Need a way to prevent the same commit from updating the issue twice.