Merge branch 'fp4-add-info-to-profile' into 'master'