Merge "BugFix: add synchronized protection"