r8835: integration improvements