COMP: using math defines
Merge branch 'bug-18313-Comp'