Backport frame delay patches
Merge pull request #910 from mprobinson/master

Backport frame delay patches