1. Fix synchronization.
Merge remote-tracking branch 'Minerva/master'