OFC-895: Teddy

Owned by kittivlop