I've compiled and tested #1 approach (revert f934641294ca2e09016c689862378fbb15da4d4, and 0be275e3a5607b23f5132121bca22a10ee23aa99) as Vladimir Marko suggested.
It works very good for me so far on 4.9.16
I've compiled and tested #1 approach (revert f934641294ca2e0 9016c689862378f bb15da4d4, 3f5132121bca22a 10ee23aa99)
and 0be275e3a5607b2
as Vladimir Marko suggested.
It works very good for me so far on 4.9.16