Merge branch 'mg/jitter'