Based on these observations, we will need to download the templates from the current base theme BEFORE upgrading the bundle otherwise they will be replaced by the new version of the base theme.