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

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