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

This reverts commit f53da50609e3db16482b049a11a317f1c329797f.
Rebase from 'upstream' @ version '0.9.25'
Trimmed the branch to only the calibration sub directory