Merge "Fix condition where FP would require confirmation" into sc-dev