Math4 Tweaks (release/2.9)

A backport of #424