Merge commit '56755f77eb93310aab45013b29fd9614ebb72282' * commit '56755f77eb93310aab45013b29fd9614ebb72282': Remove GAIA string