Merge pull request #3244 from henricm/fix-for-synchronization-attribute