Merged diffs between popcorn and topgun