Some backporting and the patch with version updates and all the mumbo-jumbo

The patch is **not** tested. :angel: