based on git revision cdbc097ee0990c555acc88811273e93f2d72555e.
