backport 3.0.8 forward