Merge "FP name shouldn't be allowed to allow/display non-null names" into oc-dev