Since Mojang is working on a 1.16.2 release (release candidate 2 just dropped yesterday), I have paused any work into the update so we do not want to do the upgrade twice. I would assume that the final release should be out in the coming days (latest in a week) and then observe how the spigot updates come along and make further decisions on the upgrade then.

I hope we can do it before September.