VE-908 Merge more Wikia changes; Fix dialog inheritance; Add back missing images