Merge 260225:

  Fix circular math macro.

PR:	146082