Merge "Remove flag from local override command." into main