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

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