Merge "Support ERROR_ATOM_ID_INVALID_POSITION" into rvc-dev