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

This reverts commit 85a0f8887f9917ede28daf3b4c5df92d4d24c7d1.
Rebase from 'upstream' @ version '0.9.25'
Trimmed the branch to only the calibration_estimation sub directory