Merge "sac template fixes" into jb-mr1.1-docs