Rebasing to latest commit from upstream