backport recent backend refinements
backport recent engine refinements