Merge "Add a dedicated error code for missing function ID" into main