new powerhal and other upstream changes