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

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