Are these changes specific to Qubell? Can we open a pull request upstream?