add long-lost TBD duration commit
Merge branch 'master' into staging