Merge branch "partner", to simplify partner integration.