Refactor patch #19 on 9.3.x branch. #19 does not apply cleanly #22 is not passing tests
added 1 commit
Compare with previous version