Merge "AR/FR: Settings changes."