I tried applying the patch you mentioned here but with all the changes that were made since then; to not include the patch, I’m horribly confused on what exactly needs to get added and removed.
Especially when it came to the static bool execute()
function