Merged latest upstream changes