Merge "Fix issues in FP Settings"