add crosszone support to the CF template
Merge remote-tracking branch 'origin/master'