port fix to main version for pulling template forward (still on manual version...)