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

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