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

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