Backport Smartass2 from 3.0.29