Implements #1233. Few sync improvement in scheduler tasks.
Merge pull request #1235 from emmanuel-keller/1.6

Implements #1233. Few sync improvement in scheduler tasks.