Merge "Preparing for work on string interning for AppImages."