Merge commit '480332f6c5ee0da552426716abff5ddd87074a5f' * commit '480332f6c5ee0da552426716abff5ddd87074a5f': Revise template to match spec per jham.
Merge commit '480332f6c5ee0da552426716abff5ddd87074a5f' * commit '480332f6c5ee0da552426716abff5ddd87074a5f': Revise template to match spec per jham.