Create a rebased patch for #18885
legacy/trac#18885 Parent ticket: legacy/trac#20680
issue