Fixed some bugs.  Refs #8096.
Merge branch 'feature/8096_support_fp_profile9' into develop