teaser support (wip)
teaser support
Merge commit 'github/testing' into beta