Fix typo
Add some terms relevant to 70-FA-T-12
Merge branch 'develop'