Increased delay by 150ms
Merge remote-tracking branch 'upstream/master'