Merge "Fix version for Galaxy"