Is this going to be a source of conflicts when we merge with the upstream branch?