applying bundle made for next-mr-bugfixing to trunk-bugfixing branch of the bug