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

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