fp first hot fix test
Merge branch 'hotfix/fp_first_hotfix'