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

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