[batrachoid]

Have you read this thread? https://bbpress.org/forums/topic/first-pass-at-a-fix-for-deep-integration-in-trunk