Merge "fix synchronization" into jb-dev