Fixing typo in template, BAU-125
Merge branch 'dev-BAU-125' into release/2.9.17rc