Allow compatibility with em-synchrony
Merge branch 'fix/em_synchrony' into integration