Create a rebased patch for
#18885
legacy/trac#18885 (moved)
Parent ticket:
legacy/trac#20680 (moved)