Backport fxp from 8-stable