cleanup fd template, better specificity
Merge branch 'hotfix/1.5.0'