Merge "Slightly improve historical app opp dumping"