Adjust flay threshold
Merge branch 'master' into merge-inverse
Fix issues found by devtools