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

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