Revert "Trimmed the branch to only the calibration sub directory"

This reverts commit e1722e8ab68d229d7a3a5a4cc098fbb358fc3595.
Rebase from 'upstream'
Trimmed the branch to only the calibration sub directory