I am personally ok with jumping to 3.20 if you are willing to do the 3.20 branch. I am very nervous given our experience of instability wrt Javassist updates, so anything we can do to minimize that I think we should.