Cherry pick progress tweaks from deluxe versions