Latest sources from upstream 0.6.35