Backport to Dancer1