Message properties conflits resolved
Merge pull request #619 from ssushma/dev-branch

Message properties conflits resolved