Merge "Change the Csar installer"