Fixed an issue related to comparing messages (equals() instead of ==)
Merge branch 'feature-sync' into develop