[Issue #142] Synchronize nb pending events
Merge branch 'fix-7QD' into develop