Merge upstream

PR to make visible forked changes.