Merge "Omit the authority if moving returned cursor failed." into nyc-andromeda-dev