Backport setup changes