Merging from CAEP's latest commits.