Added barrier to the finalization.
Merge remote-tracking branch 'origin/master'