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

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