all/bumblebee: new cherrypicked patches as suggested by Lekensteyn