pre flickr branch commit