Backport latest changes from Thingamablog-Example.