Merge branch 'lassi'
update
afn_db update
afn server update
Merge branch 'nari'
modify typo