Fix typo
Merge branch 'xifi' into develop