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

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