Applied to trunk (with significant changes).