Technically, option 7 requires eNB to be upgraded to ng-eNB and therefore would not require S1-AP anymore. However, upgrading all eNBs to ng-eNBs will not be feasible for many operators, so vendors are offering 5GC with built in EPC+ functionalities.