- for upstream 2010-01-21