Backport fallback templates from 6.2