Regression stencil fix in MotoGP and FFI/II

Issue #2595