Try new patch as described in #4522.
Merge branch 'TRAC4522v2' into dev