Merge "Avoid broken markup due to conversion table DB queries in Installer:parse()"