I have applied all patches locally, pushed some of them to the master branch already, and also made these local changes: