Merge "Add API comment for future potential behavior change" into main