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

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