Merge upstream blead changes