Merge "ApiQueryBase::checkRowCount() was removed"