Merging the changes in the GaiaEHR code base.