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

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