Merging the two main forms into one on the Fulfilment Partners -> Manage screen. This FE change requires a BE update to make both forms work together, so this is currently broken. FE issue, #1332.