Merge ffix to the staging

Spelling error fix